Use clutter_event_get_* instead of ShellGlobal

Before Clutter gained accessors for event information, we had
shell_global_ functions.  Now that Clutter has them, use them and
delete the ShellGlobal code.

http://bugzilla.gnome.org/show_bug.cgi?id=594561

diff --git a/js/ui/button.js b/js/ui/button.js
index 3cc55705017c1ac51d96f3b5b359f8ef3b2110e4..5fb594769d38d26087c7cdbbb0ffa7346250b3c3 100644 (file)
--- a/js/ui/button.js
+++ b/js/ui/button.js
@@ -108,16 +108,15 @@ iconButton.prototype = {
         this.actor.set_opacity(0);
         parent.connect("enter-event", Lang.bind(this, function(actor, event) {
             this._shouldHide = false;
-
             // Nothing to do if the cursor has come back from a child of the parent actor
-            if (actor.get_children().indexOf(Shell.get_event_related(event)) != -1)
+            if (actor.get_children().indexOf(event.get_related()) != -1)
                 return;
 
             this._fadeIn();
         }));
         parent.connect("leave-event", Lang.bind(this, function(actor, event) {
             // Nothing to do if the cursor has merely entered a child of the parent actor
-            if (actor.get_children().indexOf(Shell.get_event_related(event)) != -1)
+            if (actor.get_children().indexOf(event.get_related()) != -1)
                 return;
 
             // Remember that we should not be visible to hide the button if forceShow is unset

diff --git a/js/ui/dash.js b/js/ui/dash.js
index db403617d076107a007596481e44138bb22d96ac..f7f0658306e99b7272d7409ef2762da7594f1333 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -641,7 +641,7 @@ Dash.prototype = {
         }));
         this._searchEntry.entry.connect('key-press-event', Lang.bind(this, function (se, e) {
             let text = this._searchEntry.getText();
-            let symbol = Shell.get_event_key_symbol(e);
+            let symbol = e.get_key_symbol();
             if (symbol == Clutter.Escape) {
                 // Escape will keep clearing things back to the desktop.
                 // If we are showing a particular section of search, go back to all sections.

diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index dab0f52606aec0b57aea093bd9e7ad83154d3906..120af3279f433aea6e575e6deb5bf2b7b3c6490e 100644 (file)
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -418,7 +418,7 @@ LookingGlass.prototype = {
             return true;
         }));
         this._entry.connect('key-press-event', Lang.bind(this, function(o, e) {
-            let symbol = Shell.get_event_key_symbol(e);
+            let symbol = e.get_key_symbol();
             if (symbol == Clutter.Escape) {
                 this.close();
                 return true;

diff --git a/js/ui/main.js b/js/ui/main.js
index c33141055ffe4a1a670e874c90abf177bce9fce9..9df8be39b97e25325d623e5bd9472b1f1c2ea362 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -155,7 +155,7 @@ function _globalKeyPressHandler(actor, event) {
     let type = event.type();
 
     if (type == Clutter.EventType.KEY_PRESS) {
-        let symbol = Shell.get_event_key_symbol (event);
+        let symbol = event.get_key_symbol();
         if (symbol == Clutter.Print) {
             // We want to be able to take screenshots of the shell at all times
             let gconf = Shell.GConf.get_default();
@@ -169,7 +169,7 @@ function _globalKeyPressHandler(actor, event) {
             return true;
         }
     } else if (type == Clutter.EventType.KEY_RELEASE) {
-        let symbol = Shell.get_event_key_symbol (event);
+        let symbol = event.get_key_symbol();
         if (symbol == Clutter.Super_L || symbol == Clutter.Super_R) {
             // The super key is the default for triggering the overview, and should
             // get us out of the overview when we are already in it.

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 4e969c07893a482202f4107a2bfd49fe9a8975b3..3ef12c2f71f298c0a8d8f23e267b0fe69e4528d6 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -472,14 +472,14 @@ Panel.prototype = {
     },
 
     _onHotCornerLeft : function(actor, event) {
-        if (Shell.get_event_related(event) != this._hotCornerEnvirons) {
+        if (event.get_related() != this._hotCornerEnvirons) {
             this._hotCornerEntered = false;
         }
         return false;
     },
 
     _onHotCornerEnvironsLeft : function(actor, event) {
-        if (Shell.get_event_related(event) != this._hotCorner) {
+        if (event.get_related() != this._hotCorner) {
             this._hotCornerEntered = false;
         }
         return false;

diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index c0d4b981e54894b5fae72a3f9236fae74285f1cd..67d5b8b4fbc409b45de6d03f96378fa4ce19f4b9 100644 (file)
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -132,7 +132,7 @@ RunDialog.prototype = {
         }));
 
         this._entry.connect('key-press-event', Lang.bind(this, function(o, e) {
-            let symbol = Shell.get_event_key_symbol(e); 
+            let symbol = e.get_key_symbol();
             if (symbol == Clutter.Escape) {
                 this.close();
                 return true;

diff --git a/js/ui/widgetBox.js b/js/ui/widgetBox.js
index 5eab6e5f1027487df503c311fe3b531558c509ed..e12dd7376ab19bb2163e4952dcaf29a9c0e01aa7 100644 (file)
--- a/js/ui/widgetBox.js
+++ b/js/ui/widgetBox.js
@@ -296,7 +296,7 @@ WidgetBox.prototype = {
                     this.state == Widget.STATE_POPPING_OUT)) {
             // If moving into another actor within this._hbox, let the
             // event be propagated
-            let into = Shell.get_event_related(event);
+            let into = event.get_related();
             while (into) {
                 if (into == this._hbox)
                     return false;

diff --git a/src/shell-global.c b/src/shell-global.c
index f8eff40977df60c44b814aec080bb2fd3f6c652f..727957046229a93be23b0070e7d4b8b998f9844b 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -295,47 +295,6 @@ shell_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
                                               0, NULL);
 }
 
-/**
- * shell_get_event_key_symbol:
- *
- * Return value: Clutter key value for the key press and release events, 
- *               as specified in clutter-keysyms.h  
- */
-guint16
-shell_get_event_key_symbol(ClutterEvent *event)
-{
-  g_return_val_if_fail(event->type == CLUTTER_KEY_PRESS ||
-                       event->type == CLUTTER_KEY_RELEASE, 0);
-
-  return event->key.keyval;
-}
-
-/**
- * shell_get_button_event_click_count:
- *
- * Return value: click count for button press and release events
- */
-guint16
-shell_get_button_event_click_count(ClutterEvent *event)
-{
-  g_return_val_if_fail(event->type == CLUTTER_BUTTON_PRESS ||
-                       event->type == CLUTTER_BUTTON_RELEASE, 0);
-  return event->button.click_count;
-}
-
-/**
- * shell_get_event_related:
- *
- * Return value: (transfer none): related actor
- */
-ClutterActor *
-shell_get_event_related (ClutterEvent *event)
-{
-  g_return_val_if_fail (event->type == CLUTTER_ENTER ||
-                        event->type == CLUTTER_LEAVE, NULL);
-  return event->crossing.related;
-}
-
 /**
  * shell_global_get:
  *

diff --git a/src/shell-global.h b/src/shell-global.h
index 3cda07b56b26bc765bd312c54c3640d594e78a8c..998fef23650a102264d7c26d494f7844e70e795d 100644 (file)
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -36,10 +36,6 @@ GType            shell_global_get_type            (void) G_GNUC_CONST;
 gboolean shell_clutter_texture_set_from_pixbuf (ClutterTexture *texture,
                                                 GdkPixbuf      *pixbuf);
 
-guint16 shell_get_event_key_symbol(ClutterEvent *event);
-
-guint16 shell_get_button_event_click_count(ClutterEvent *event);
-
 ClutterActor *shell_get_event_related(ClutterEvent *event);
 
 ShellGlobal *shell_global_get (void);